Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automation: main-next integrate #16412

Merged
merged 11 commits into from
Jul 18, 2023
Merged

Automation: main-next integrate #16412

merged 11 commits into from
Jul 18, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

The aim of this pull request is to sync main and next branch. If this PR is assigned to you, you need to do the following:

  • Acknowledge the pull request by adding a comment -- "Actively working on it".
  • Resolve any CI failures between main-next-a8fbb2e and next and push the results to upstream. Do NOT rebase or squash this branch: its history must be preserved.
  • Address any CI failures. Ignore any Real service e2e test and Stress test failures because they are non-required CI workflows.
  • Recommended git commands:
    • git checkout main-next-a8fbb2e -- check out the PR branch.
    • FIX ANY CI FAILURES
    • git commit --amend -m Automation: main-next integrate
    • git push --force-with-lease

kian-thompson and others added 11 commits July 10, 2023 15:35
Server-side changes for
#15069

We lost ability to collect ping data: [Migrating from 2.x to 3.0 |
Socket.IO](https://socket.io/docs/v4/migrating-from-2-x-to-3-0/#no-more-pong-event-for-retrieving-latency).
Thus, we need to implement new handling for "ping" events.

Continuation of #13942


[AB#2499](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/2499)
## Description

This PR adds single call move tests to the `defaultChangeFamily.spec.ts`
file. Most of the tests are similar to the move tests found in
`sequenceEditBuilder.spec.ts`, where the test expectations are expressed
in terms of the tree state.
This change deprecates the experimental method
closeAndGetPendingLocalState on IContainer and moves it to
IContainerExperimental.
IContainerExperimental is an interface that is easily casted to, which
enables partners to access experimental features for testing and
evaluation.
Moving the experimental method off IContainer will reduce exposure and
churn on that production interface as we iterate on and finalize our
experimental features.
Experimental features should not be used in production environments.

---------

Co-authored-by: Tony Murphy <anthonm@microsoft.com>
…ndexes and offests (#16279)

## Description
Refactored lineage and detach events in sequence field changesets to use
changeset local cell IDs instead of indexes and offsets. This fixes some
cases where we previously could not determine the relative position of
marks targeting empty cells.

---------

Co-authored-by: yann-achard-MS <97201204+yann-achard-MS@users.noreply.github.com>
## Description
The #15969 details the
current problem when uploading binary content blobs during the first
summary upload.


In order to prepare the server to support distinct formats for decoded
and encoded summaries, we are creating a new method that will convert
from the IWholeSummaryTree to a ISummaryTree.
## Description

Update misc schema use to use the schema2 leaf builder.
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/npm/node-semver/releases">semver's
releases</a>.</em></p>
<blockquote>
<h2>v5.7.2</h2>
<h2><a
href="https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2">5.7.2</a>
(2023-07-10)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><a
href="https://github.com/npm/node-semver/commit/2f8fd41487acf380194579ecb6f8b1bbfe116be0"><code>2f8fd41</code></a>
<a href="https://redirect.github.com/npm/node-semver/pull/585">#585</a>
better handling of whitespace (<a
href="https://redirect.github.com/npm/node-semver/issues/585">#585</a>)
(<a href="https://github.com/joaomoreno"><code>@​joaomoreno</code></a>,
<a
href="https://github.com/lukekarrys"><code>@​lukekarrys</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md">semver's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2">5.7.2</a>
(2023-07-10)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><a
href="https://github.com/npm/node-semver/commit/2f8fd41487acf380194579ecb6f8b1bbfe116be0"><code>2f8fd41</code></a>
<a href="https://redirect.github.com/npm/node-semver/pull/585">#585</a>
better handling of whitespace (<a
href="https://redirect.github.com/npm/node-semver/issues/585">#585</a>)
(<a href="https://github.com/joaomoreno"><code>@​joaomoreno</code></a>,
<a
href="https://github.com/lukekarrys"><code>@​lukekarrys</code></a>)</li>
</ul>
<h2>5.7</h2>
<ul>
<li>Add <code>minVersion</code> method</li>
</ul>
<h2>5.6</h2>
<ul>
<li>Move boolean <code>loose</code> param to an options object, with
backwards-compatibility protection.</li>
<li>Add ability to opt out of special prerelease version handling with
the <code>includePrerelease</code> option flag.</li>
</ul>
<h2>5.5</h2>
<ul>
<li>Add version coercion capabilities</li>
</ul>
<h2>5.4</h2>
<ul>
<li>Add intersection checking</li>
</ul>
<h2>5.3</h2>
<ul>
<li>Add <code>minSatisfying</code> method</li>
</ul>
<h2>5.2</h2>
<ul>
<li>Add <code>prerelease(v)</code> that returns prerelease
components</li>
</ul>
<h2>5.1</h2>
<ul>
<li>Add Backus-Naur for ranges</li>
<li>Remove excessively cute inspection methods</li>
</ul>
<h2>5.0</h2>
<ul>
<li>Remove AMD/Browserified build artifacts</li>
<li>Fix ltr and gtr when using the <code>*</code> range</li>
<li>Fix for range <code>*</code> with a prerelease identifier</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/npm/node-semver/commit/f8cc313550691a50d9662d8c94f0c033717efd7d"><code>f8cc313</code></a>
chore: release 5.7.2</li>
<li><a
href="https://github.com/npm/node-semver/commit/2f8fd41487acf380194579ecb6f8b1bbfe116be0"><code>2f8fd41</code></a>
fix: better handling of whitespace (<a
href="https://redirect.github.com/npm/node-semver/issues/585">#585</a>)</li>
<li><a
href="https://github.com/npm/node-semver/commit/deb5ad51bf58868fa243c1683775305fe9e0e365"><code>deb5ad5</code></a>
chore: <code>@​npmcli/template-oss</code><a
href="https://github.com/4"><code>@​4</code></a>.16.0</li>
<li>See full diff in <a
href="https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2">compare
view</a></li>
</ul>
</details>
<details>
<summary>Maintainer changes</summary>
<p>This version was pushed to npm by <a
href="https://www.npmjs.com/~lukekarrys">lukekarrys</a>, a new releaser
for semver since your current version.</p>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=semver&package-manager=npm_and_yarn&previous-version=5.7.1&new-version=5.7.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/microsoft/FluidFramework/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## Description

Remove unused value schema from editable tree test schema, and replace
global field with local field.
## Description

Sets suiteName on `FLUID_TEST_MULTIREPORT` similarly to what we did on
`FLUID_TEST_REPORT`. This restores some of the niceties in e2e test
names we had before switching flags in #15983
## Description

The `--dir` flag in the `exec` command is not working, and the root
cause is that the code expected the flag to be called `directory` but it
was called `dir`. The reason this wasn't caught was because of sloppy
typing. I had used an `any` to parse the raw flags into filter and
selection objects, which introduced this error.

## Fix

The flag types are somewhat complex, so it seemed simpler to make
simpler "mirror types" that structurally match the oclif flag types, but
are typed more simply. This allows me to add some type safety to the
parse functions.

## Testing

I added several new tests that exercise the selection and filtering.
Most tests work against the helper filtering functions. However, there
are also tests that run through a new test-only command to validate that
converting oclif flags into filter/selection objects is done correctly.
@msfluid-bot msfluid-bot requested review from a team as code owners July 18, 2023 00:56
@github-actions github-actions bot added area: build Build related issues area: contributor experience area: dds Issues related to distributed data structures area: dds: tree area: dev experience Improving the experience of devs building on top of fluid labels Jul 18, 2023
@github-actions github-actions bot added area: examples Changes that focus on our examples area: loader Loader related issues area: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc public api change Changes to a public API base: next PRs targeted against next branch labels Jul 18, 2023
@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: -697 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 432.6 KB 432.6 KB No change
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 232.23 KB 232.23 KB No change
loader.js 144.41 KB 144.41 KB No change
map.js 44.88 KB 44.88 KB No change
matrix.js 138.07 KB 138.07 KB No change
odspDriver.js 87.87 KB 87.87 KB No change
odspPrefetchSnapshot.js 41.12 KB 41.12 KB No change
sharedString.js 154.17 KB 154.17 KB No change
sharedTree2.js 231.23 KB 230.55 KB -697 Bytes
Total Size 1.62 MB 1.62 MB -697 Bytes

Baseline commit: a09358b

Generated by 🚫 dangerJS against 1ae9109

@sonalideshpandemsft sonalideshpandemsft merged commit 1ae9109 into next Jul 18, 2023
37 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-a8fbb2e branch July 18, 2023 01:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: build Build related issues area: contributor experience area: dds: tree area: dds Issues related to distributed data structures area: dev experience Improving the experience of devs building on top of fluid area: examples Changes that focus on our examples area: loader Loader related issues area: server Server related issues (routerlicious) area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch do-not-squash-merge main-next-integrate public api change Changes to a public API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants